merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 29 Nov 2006 12:43:11 +0000 (12:43 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 29 Nov 2006 12:43:11 +0000 (12:43 +0000)

Trivial merge